Merge from emacs-24; up to r108032
authorChong Yidong <cyd@gnu.org>
Sun, 10 Jun 2012 13:21:29 +0000 (21:21 +0800)
committerChong Yidong <cyd@gnu.org>
Sun, 10 Jun 2012 13:21:29 +0000 (21:21 +0800)
commit08f063d3c79ff4a06bdf30d75b3fd3d27cd5525e
tree4e8700a70ba779e1536deab494b0e21a4f913c22
parenta75e4d589af18d949874afaf31bb6c4930cdc2bd
parent9e0ee11791f17e9ae9f90fb0936bf05abdbaf49a
Merge from emacs-24; up to r108032